Merge "Remove prefix from forceHTTPS cookie"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 29 Aug 2013 20:56:26 +0000 (20:56 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 29 Aug 2013 20:56:26 +0000 (20:56 +0000)
1  2 
includes/User.php

Simple merge